Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge account management work #355

Closed
wants to merge 59 commits into from
Closed

Conversation

ghost
Copy link

@ghost ghost commented Mar 4, 2020

Issue #, if available:

Description of changes:

  • Merged changes from the account-mgmt branch
  • Ejected from Standard to ESLint for an easier dev experience (and because I needed to make a couple customizations to it for Jest and the CRA scripts)
  • Fixed a few more critical issues so tests would pass

Note: this is blocked on #350 as it's based on that.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Alex Chew and others added 30 commits July 31, 2019 14:51
Implement "Registered Accounts" admin page
amazon-meaisiah added 14 commits March 4, 2020 11:40
All the various extensions listed in the docs are also supported,
including Postman extensions, x-amazon-apigateway-integration
extensions, x-amazon-apigateway-authorizers extensions, and combinations
of all three. You can also choose whether to export as YAML or JSON.
It's a separate dropdown, but reuses the same modal, and it just
delegates to AWS in a lambda to generate the export. (The logic is
nearly identical to the SDK generation.)
@ghost ghost changed the title Meaisiah account Merge account management work Mar 4, 2020
@ghost
Copy link
Author

ghost commented Mar 4, 2020

The Git history is a mild mess, but that's because of three things:

  1. I merged it incrementally, because it wouldn't merge cleanly initially and had a lot of merge conflicts.
  2. I cherry-picked about 1/3 of my commits to include in Implement support for exporting Swagger/OpenAPI definitions, clean up backend lambda #350, and so I had to re-merge everything.
  3. When I went to re-merge the branch, I had to do it in two parts to avoid some odd merge conflicts where Git didn't want to properly diff two changed files and instead just listed them as "both added". I couldn't just cherry-pick the merge commits in question as it'd lose their parents, and I wanted to keep the history intact.

Edit: clarity

@ghost ghost marked this pull request as ready for review March 4, 2020 21:43
@ghost ghost changed the base branch from master to meaisiah-export March 4, 2020 21:47
@ghost ghost force-pushed the meaisiah-account branch from 77c04b6 to c149cbf Compare March 5, 2020 01:27
Also, make `/admin` a proper redirect to `/admin/apis` instead of
letting it just be an alias.
@ghost ghost force-pushed the meaisiah-account branch 2 times, most recently from 176a0cf to 0cefef2 Compare March 5, 2020 20:39
@ghost ghost closed this Mar 5, 2020
@ghost ghost mentioned this pull request Mar 5, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants